From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon, 29 Apr 2013 17:09:01 +0000 (-0400)
Subject: network: Remove semi-complex primary device finding
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4171
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=cd9c5b9c5df665f6da0e57ee7ead4ba3219b3109;p=gnome-shell.git

network: Remove semi-complex primary device finding

According to dcbw (and some updated documentation), there will
always be a 1:1 correspondence between NMActiveConnection and
an NMDevice.

https://bugzilla.gnome.org/show_bug.cgi?id=700322
---

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 6df61c3c6..de4444a9e 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1946,18 +1946,10 @@ const NMApplet = new Lang.Class({
                 active_vpn = a;
 
             if (!a._primaryDevice) {
-                if (a._type != NetworkManager.SETTING_VPN_SETTING_NAME) {
-                    // find a good device to be considered primary
-                    a._primaryDevice = null;
-                    let devices = a.get_devices() || [];
-                    for (let j = 0; j < devices.length; j++) {
-                        let d = devices[j];
-                        if (d._delegate) {
-                            a._primaryDevice = d._delegate;
-                            break;
-                        }
-                    }
-                } else
+                if (a._type != NetworkManager.SETTING_VPN_SETTING_NAME)
+                    // This list is guaranteed to have one device in it.
+                    a._primaryDevice = a.get_devices()[0]._delegate;
+                else
                     a._primaryDevice = this._vpnSection;
 
                 if (a._primaryDevice)